gtk/gtkseparatortoolitem.c remove pointless #undef GTK_DISABLE_DEPRECATED.

2008-08-04  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkseparatortoolitem.c
	* tests/testactions.c: remove pointless #undef GTK_DISABLE_DEPRECATED.

	* gtk/gtkcalendar.c (calendar_set_display_option): use
	gtk_calendar_set_display_options() instead of the deprecated
	gtk_calendar_display_options().

svn path=/trunk/; revision=20977

diff --git a/ChangeLog b/ChangeLog
index fede3f24a37f19f9eb821af23e2a9372a39755d5..0ef47e7a5b360d65718b7fc156c8403e215f686a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-04  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkseparatortoolitem.c
+       * tests/testactions.c: remove pointless #undef GTK_DISABLE_DEPRECATED.
+
+       * gtk/gtkcalendar.c (calendar_set_display_option): use
+       gtk_calendar_set_display_options() instead of the deprecated
+       gtk_calendar_display_options().
+
 2008-08-04  Carlos Garnacho  <carlos@imendio.com>
 
        * gtk/gtkfilechooserbutton.c: Fix "/* within comment" warning.

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index a1c73bb22e0bf58a2cffe10e25206e84cf85ca70..ea1005c3a102bf7bd926919039fd2416b2f476d2 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -47,9 +47,7 @@
 #include <windows.h>
 #endif
 
-#undef GTK_DISABLE_DEPRECATED
 #include "gtkcalendar.h"
-
 #include "gtkdnd.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
@@ -1269,7 +1267,7 @@ calendar_set_display_option (GtkCalendar              *calendar,
     flags = calendar->display_flags | flag;
   else
     flags = calendar->display_flags & ~flag; 
-  gtk_calendar_display_options (calendar, flags);
+  gtk_calendar_set_display_options (calendar, flags);
 }
 
 static gboolean

diff --git a/gtk/gtkseparatortoolitem.c b/gtk/gtkseparatortoolitem.c
index 683106b2d99b3c8017dfb6319c32a765f48f2da4..52af0df8b25031cce749e91166e295d92336ed34 100644 (file)
--- a/gtk/gtkseparatortoolitem.c
+++ b/gtk/gtkseparatortoolitem.c
@@ -19,8 +19,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include "config.h"
 #include "gtkseparatormenuitem.h"
 #include "gtkseparatortoolitem.h"

diff --git a/tests/testactions.c b/tests/testactions.c
index 3d55d8a6a483889309c61b42f10918e741c10ebd..f63aac84c6a91421484a4b23da642b76621464e2 100644 (file)
--- a/tests/testactions.c
+++ b/tests/testactions.c
@@ -17,7 +17,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#undef GTK_DISABLE_DEPRECATED
 #include "config.h"
 #include <gtk/gtk.h>